From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Thu, 21 Jan 2010 22:03:46 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8462^2~37
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f96bdc55a873e4019f256261cd4a870ed209426c;p=emacs.git

Merge from mainline.
---

f96bdc55a873e4019f256261cd4a870ed209426c